auto merge of #157 : rust-lang/cargo/graph-resolve, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 10 Jul 2014 19:52:04 +0000 (19:52 +0000)
committerbors <bors@rust-lang.org>
Thu, 10 Jul 2014 19:52:04 +0000 (19:52 +0000)
commit0355cb6584ca416cc64f9a5fd66148049c7dafd4
tree5e38e23fa43c4769d974ac28a307e99596f6fbe8
parenta5bcfa3746d70955e86f2d00c0ca70d51414a9c2
parent662b8553d65314132abdfff608418f5df766c7b2
auto merge of #157 : rust-lang/cargo/graph-resolve, r=alexcrichton

This incorporates previous bugfixes by @alexcrichton that are still stuck in bors.